/build-x
/emacs
/emacs.debhelper.log
-/emacs22
-/emacs22-bin-common
-/emacs22-bin-common.README.Debian
-/emacs22-bin-common.debhelper.log
-/emacs22-bin-common.postinst
-/emacs22-bin-common.postrm
-/emacs22-bin-common.prerm
-/emacs22-bin-common.substvars
-/emacs22-common
-/emacs22-common.README.Debian
-/emacs22-common.debhelper.log
-/emacs22-common.docs
-/emacs22-common.links
-/emacs22-common.postinst
-/emacs22-common.prerm
-/emacs22-el
-/emacs22-el.debhelper.log
-/emacs22-el.prerm
-/emacs22-gtk
-/emacs22-gtk.README.Debian
-/emacs22-gtk.debhelper.log
-/emacs22-gtk.desktop
-/emacs22-gtk.menu
-/emacs22-gtk.postinst
-/emacs22-gtk.postinst.debhelper
-/emacs22-gtk.postrm.debhelper
-/emacs22-gtk.prerm
-/emacs22-gtk.substvars
-/emacs22-nox
-/emacs22-nox.README.Debian
-/emacs22-nox.debhelper.log
-/emacs22-nox.desktop
-/emacs22-nox.links
-/emacs22-nox.menu
-/emacs22-nox.postinst
-/emacs22-nox.postinst.debhelper
-/emacs22-nox.postrm
-/emacs22-nox.postrm.debhelper
-/emacs22-nox.prerm
-/emacs22-nox.substvars
-/emacs22.README.Debian
-/emacs22.debhelper.log
-/emacs22.desktop
-/emacs22.links
-/emacs22.menu
-/emacs22.postinst
-/emacs22.postinst.debhelper
-/emacs22.postrm
-/emacs22.postrm.debhelper
-/emacs22.prerm
-/emacs22.substvars
+/emacs.substvars
+/emacs23
+/emacs23-bin-common
+/emacs23-bin-common.README.Debian
+/emacs23-bin-common.debhelper.log
+/emacs23-bin-common.postinst
+/emacs23-bin-common.postrm
+/emacs23-bin-common.prerm
+/emacs23-bin-common.substvars
+/emacs23-common
+/emacs23-common.README.Debian
+/emacs23-common.debhelper.log
+/emacs23-common.docs
+/emacs23-common.links
+/emacs23-common.postinst
+/emacs23-common.prerm
+/emacs23-common.substvars
+/emacs23-el
+/emacs23-el.debhelper.log
+/emacs23-el.prerm
+/emacs23-el.substvars
+/emacs23-gtk
+/emacs23-gtk.README.Debian
+/emacs23-gtk.debhelper.log
+/emacs23-gtk.desktop
+/emacs23-gtk.menu
+/emacs23-gtk.postinst
+/emacs23-gtk.postinst.debhelper
+/emacs23-gtk.postrm.debhelper
+/emacs23-gtk.prerm
+/emacs23-gtk.substvars
+/emacs23-nox
+/emacs23-nox.README.Debian
+/emacs23-nox.debhelper.log
+/emacs23-nox.desktop
+/emacs23-nox.links
+/emacs23-nox.menu
+/emacs23-nox.postinst
+/emacs23-nox.postinst.debhelper
+/emacs23-nox.postrm
+/emacs23-nox.postrm.debhelper
+/emacs23-nox.prerm
+/emacs23-nox.substvars
+/emacs23.README.Debian
+/emacs23.debhelper.log
+/emacs23.desktop
+/emacs23.links
+/emacs23.menu
+/emacs23.postinst
+/emacs23.postinst.debhelper
+/emacs23.postrm
+/emacs23.postrm.debhelper
+/emacs23.prerm
+/emacs23.substvars
/emacsVER-common.README.00
/emacsVER-common.README.01
/files
+emacs23 (23.1+1-1) unstable; urgency=low
+
+ * New emacs23 packages.
+
+ * The debian/dfsg-splitter has been updated.
+
+ * Patches have been removed or adjusted.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 18 Jul 2009 18:41:25 -0700
+
emacs22 (22.3+1-1) unstable; urgency=low
* New upstream release. (closes: #512134)
-Source: emacs22
+Source: emacs23
Section: editors
Priority: optional
Maintainer: Rob Browning <rlb@defaultvalue.org>
Uploaders: Jerome Marant <jerome@debian.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.7.2
Package: emacs
Section: editors
Priority: optional
Architecture: all
-Depends: emacs22 | emacs22-gtk | emacs22-nox
+Depends: emacs23 | emacs23-gtk | emacs23-nox
Provides: emacsen, editor, info-browser, mail-reader, news-reader
Description: The GNU Emacs editor (metapackage)
GNU Emacs is the extensible self-documenting text editor.
This is a metapackage which will always depend on the latest Emacs
release.
-Package: emacs22
+Package: emacs23
Section: editors
Priority: optional
Architecture: any
-Depends: emacs22-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
Provides: emacsen, editor, info-browser, mail-reader, news-reader
-Suggests: emacs22-common-non-dfsg
-Conflicts: emacs22-nox, emacs22-gtk, w3-el
-Replaces: emacs22-nox, emacs22-gtk
+Suggests: emacs23-common-non-dfsg
+Conflicts: emacs23-nox, emacs23-gtk, w3-el
+Replaces: emacs23-nox, emacs23-gtk
Description: The GNU Emacs editor
GNU Emacs is the extensible self-documenting text editor.
-Package: emacs22-nox
+Package: emacs23-nox
Section: editors
Priority: optional
Architecture: any
-Depends: emacs22-bin-common (= ${binary:Version}), ${shlibs:Depends}
-Provides: emacs22, editor, emacsen, info-browser, mail-reader, news-reader
-Suggests: emacs22-common-non-dfsg
-Conflicts: emacs22, emacs22-gtk, w3-el
-Replaces: emacs22, emacs22-gtk
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: emacs23-common-non-dfsg
+Conflicts: emacs23, emacs23-gtk, w3-el
+Replaces: emacs23, emacs23-gtk
Description: The GNU Emacs editor (without X support)
GNU Emacs is the extensible self-documenting text editor.
This package contains a version of Emacs compiled without support for X.
-Package: emacs22-gtk
+Package: emacs23-gtk
Section: editors
Priority: optional
Architecture: any
-Depends: emacs22-bin-common (= ${binary:Version}), ${shlibs:Depends}
-Provides: emacs22, editor, emacsen, info-browser, mail-reader, news-reader
-Suggests: emacs22-common-non-dfsg
-Conflicts: emacs22, emacs22-nox, w3-el
-Replaces: emacs22, emacs22-nox
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: emacs23-common-non-dfsg
+Conflicts: emacs23, emacs23-nox, w3-el
+Replaces: emacs23, emacs23-nox
Description: The GNU Emacs editor (with GTK user interface)
GNU Emacs is the extensible self-documenting text editor.
This package contains a version of Emacs with a GTK user interface.
-Package: emacs22-bin-common
+Package: emacs23-bin-common
Section: editors
Priority: optional
Architecture: any
-Depends: emacs22-common (= ${source:Version}), ${shlibs:Depends}
+Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}
Description: The GNU Emacs editor's shared, architecture dependent files
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture dependent infrastructure
- that's shared by emacs22, emacs22-gtk, and emacs22-nox.
+ that's shared by emacs23, emacs23-gtk, and emacs23-nox.
-Package: emacs22-common
+Package: emacs23-common
Section: editors
Priority: optional
Architecture: all
Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
-Suggests: emacs22-el, emacs22-common-non-dfsg
-Conflicts: emacs22-el (<< ${Source-Version}), w3-el, emacs22-common-non-dfsg (<< 22.2+2-1)
+Suggests: emacs23-el, emacs23-common-non-dfsg
+Conflicts: emacs23-el (<< ${Source-Version}), w3-el, emacs22-common-non-dfsg (<< 22.2+2-1)
Replaces: emacs22-common (<< 22.2), emacs22-common-non-dfsg (<< 22.2+2-1)
Description: The GNU Emacs editor's shared, architecture independent infrastructure
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture independent infrastructure
- that's shared by emacs22, emacs22-gtk, and emacs22-nox.
+ that's shared by emacs23, emacs23-gtk, and emacs23-nox.
-Package: emacs22-el
+Package: emacs23-el
Section: editors
Priority: optional
Architecture: all
-Depends: emacs22-common (= ${source:Version})
+Depends: emacs23-common (= ${source:Version})
Description: GNU Emacs LISP (.el) files
GNU Emacs is the extensible self-documenting text editor.
This package contains the elisp sources for the convenience of users,
Priority: optional
Maintainer: Rob Browning <rlb@defaultvalue.org>
Uploaders: Jerome Marant <jerome@debian.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.7.2
Package: emacs
This package was debianized by Rob Browning <rlb@defaultvalue.org> on
Tue, 16 Dec 1997 00:05:45 -0600.
-This is the original source archive:
+The original source archive is emacs-23.1.tar.gz, and it
+can be found here for stable releases:
- prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.3.tar.gz
+ ftp://ftp.gnu.org:/gnu/emacs/
-Please see /usr/share/doc/emacs22-common/README.Debian.gz for a
+and here for alpha pre-releases:
+
+ ftp://alpha.gnu.org:/gnu/emacs/pretest/
+
+Please see /usr/share/doc/emacs23-common/README.Debian.gz for a
description of the Debian specific differences from the upstream
version.
License (GPL). See the file /usr/share/common-licenses/GPL for more
information.
- etc/emacs.1 is licensed as follows:
+ doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and
+ doc/man/rcs-checkin.1 are licensed as follows:
+
+ Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+
+ Permission is granted to make and distribute verbatim copies of this
+ document provided the copyright notice and this permission notice are
+ preserved on all copies.
+
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided that
+ the entire resulting derived work is distributed under the terms of
+ a permission notice identical to this one.
+
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated
+ in a translation approved by the Free Software Foundation.
+
+ doc/man/emacs.1 is licensed as follows:
+
+ Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+ Permission is granted to make and distribute verbatim copies of
+ this document provided the copyright notice and this permission
+ notice are preserved on all copies.
+
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided
+ that the entire resulting derived work is distributed under the
+ terms of a permission notice identical to this one.
+
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be
+ stated in a translation approved by the Free Software Foundation.
+
+ doc/man/etags.1 is licensed as follows:
- Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009 Free Software Foundation, Inc.
- Permission is granted to make and distribute verbatim copies of
- this document provided the copyright notice and this permission
- notice are preserved on all copies.
+ Permission is granted to make and distribute verbatim copies of this
+ document provided the copyright notice and this permission notice are
+ preserved on all copies.
- Permission is granted to copy and distribute modified versions
- of this document under the conditions for verbatim copying,
- provided that the entire resulting derived work is distributed
- under the terms of a permission notice identical to this one.
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided that
+ the entire resulting derived work is distributed under the terms of
+ a permission notice identical to this one.
- Permission is granted to copy and distribute translations of
- this document into another language, under the above conditions
- for modified versions, except that this permission notice may be
- stated in a translation approved by the Free Software
- Foundation.
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated
+ in a translation approved by the Free Software Foundation.
man/faq.texi is licensed as follows:
- Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner
- Copyright (C) 1992,1993 Steven Byrnes
- Copyright (C) 1990,1991,1992 Joseph Brian Wells
-
- This list of frequently asked questions about GNU Emacs with
- answers ("FAQ") may be translated into other languages,
- transformed into other formats (e.g. Texinfo, Info, WWW, WAIS),
- and updated with new information.
-
- The same conditions apply to any derivative of the FAQ as apply
- to the FAQ itself. Every copy of the FAQ must include this
- notice or an approved translation, information on who is
- currently maintaining the FAQ and how to contact them (including
- their e-mail address), and information on where the latest
- version of the FAQ is archived (including FTP information).
-
- The FAQ may be copied and redistributed under these conditions,
- except that the FAQ may not be embedded in a larger literary
- work unless that work itself allows free copying and
- redistribution.
+ Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner
+ Copyright (C) 1992,1993 Steven Byrnes
+ Copyright (C) 1990,1991,1992 Joseph Brian Wells
+
+ This list of frequently asked questions about GNU Emacs with
+ answers ("FAQ") may be translated into other languages,
+ transformed into other formats (e.g. Texinfo, Info, WWW, WAIS),
+ and updated with new information.
+
+ The same conditions apply to any derivative of the FAQ as apply to
+ the FAQ itself. Every copy of the FAQ must include this notice or
+ an approved translation, information on who is currently
+ maintaining the FAQ and how to contact them (including their
+ e-mail address), and information on where the latest version of
+ the FAQ is archived (including FTP information).
+
+ The FAQ may be copied and redistributed under these conditions,
+ except that the FAQ may not be embedded in a larger literary work
+ unless that work itself allows free copying and redistribution.
This package was debianized by Rob Browning <rlb@defaultvalue.org> on
Tue, 16 Dec 1997 00:05:45 -0600.
-This is the original source archive:
+The original source archive is emacs-@UPSTREAM_VERSION@.tar.gz, and it
+can be found here for stable releases:
- prep.ai.mit.edu:/pub/gnu/emacs/emacs-@UPSTREAM_VERSION@.tar.gz
+ ftp://ftp.gnu.org:/gnu/emacs/
+
+and here for alpha pre-releases:
+
+ ftp://alpha.gnu.org:/gnu/emacs/pretest/
Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a
description of the Debian specific differences from the upstream
License (GPL). See the file /usr/share/common-licenses/GPL for more
information.
- etc/emacs.1 is licensed as follows:
+ doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and
+ doc/man/rcs-checkin.1 are licensed as follows:
+
+ Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+
+ Permission is granted to make and distribute verbatim copies of this
+ document provided the copyright notice and this permission notice are
+ preserved on all copies.
+
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided that
+ the entire resulting derived work is distributed under the terms of
+ a permission notice identical to this one.
+
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated
+ in a translation approved by the Free Software Foundation.
+
+ doc/man/emacs.1 is licensed as follows:
+
+ Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+ Permission is granted to make and distribute verbatim copies of
+ this document provided the copyright notice and this permission
+ notice are preserved on all copies.
+
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided
+ that the entire resulting derived work is distributed under the
+ terms of a permission notice identical to this one.
+
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be
+ stated in a translation approved by the Free Software Foundation.
+
+ doc/man/etags.1 is licensed as follows:
- Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009 Free Software Foundation, Inc.
- Permission is granted to make and distribute verbatim copies of
- this document provided the copyright notice and this permission
- notice are preserved on all copies.
+ Permission is granted to make and distribute verbatim copies of this
+ document provided the copyright notice and this permission notice are
+ preserved on all copies.
- Permission is granted to copy and distribute modified versions
- of this document under the conditions for verbatim copying,
- provided that the entire resulting derived work is distributed
- under the terms of a permission notice identical to this one.
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided that
+ the entire resulting derived work is distributed under the terms of
+ a permission notice identical to this one.
- Permission is granted to copy and distribute translations of
- this document into another language, under the above conditions
- for modified versions, except that this permission notice may be
- stated in a translation approved by the Free Software
- Foundation.
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated
+ in a translation approved by the Free Software Foundation.
man/faq.texi is licensed as follows:
- Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner
- Copyright (C) 1992,1993 Steven Byrnes
- Copyright (C) 1990,1991,1992 Joseph Brian Wells
-
- This list of frequently asked questions about GNU Emacs with
- answers ("FAQ") may be translated into other languages,
- transformed into other formats (e.g. Texinfo, Info, WWW, WAIS),
- and updated with new information.
-
- The same conditions apply to any derivative of the FAQ as apply
- to the FAQ itself. Every copy of the FAQ must include this
- notice or an approved translation, information on who is
- currently maintaining the FAQ and how to contact them (including
- their e-mail address), and information on where the latest
- version of the FAQ is archived (including FTP information).
-
- The FAQ may be copied and redistributed under these conditions,
- except that the FAQ may not be embedded in a larger literary
- work unless that work itself allows free copying and
- redistribution.
+ Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner
+ Copyright (C) 1992,1993 Steven Byrnes
+ Copyright (C) 1990,1991,1992 Joseph Brian Wells
+
+ This list of frequently asked questions about GNU Emacs with
+ answers ("FAQ") may be translated into other languages,
+ transformed into other formats (e.g. Texinfo, Info, WWW, WAIS),
+ and updated with new information.
+
+ The same conditions apply to any derivative of the FAQ as apply to
+ the FAQ itself. Every copy of the FAQ must include this notice or
+ an approved translation, information on who is currently
+ maintaining the FAQ and how to contact them (including their
+ e-mail address), and information on where the latest version of
+ the FAQ is archived (including FTP information).
+
+ The FAQ may be copied and redistributed under these conditions,
+ except that the FAQ may not be embedded in a larger literary work
+ unless that work itself allows free copying and redistribution.
# run the script. The resulting two orig.tar.gz files will be placed
# into a new ./split-tmp directory.
-emacs_archive_name="emacs-22.3.tar.gz"
-emacs_dir="emacs-22.3"
-emacs_version="22.3"
-emacs_major="22"
+emacs_archive_name="emacs-23.1.tar.gz"
+emacs_dir="emacs-23.1"
+emacs_version="23.1"
+emacs_major="23"
deb_src_rev="1"
-non_main_dir="${emacs_dir}-non-dfsg"
+main_dir="$(pwd)/split-tmp/${emacs_dir}"
+non_main_dir="$(pwd)/split-tmp/${emacs_dir}-non-dfsg"
if ! test root = "`whoami`"
then
tar xzf "../${emacs_archive_name}"
find "${emacs_dir}" -name "*.elc" -exec rm {} +
-find "${emacs_dir}"/info -type f -not -name "COPYING" -exec rm {} +
+find "${emacs_dir}"/info -type f \
+ -not -name "COPYING" -not -name dir -exec rm {} +
mkdir "${non_main_dir}"
{
pushd "${emacs_dir}"
test "$1"
- test ! -e "../${non_main_dir}/$1"
- cp -a --parents "$1" "../${non_main_dir}/"
+ test ! -e "${non_main_dir}/$1"
+ cp -a --parents "$1" "${non_main_dir}/"
rm -r "$1"
popd
}
function copy_to_non_main_dir()
{
pushd "${emacs_dir}"
- cp -a --parents "$1" "../${non_main_dir}/"
+ cp -a --parents "$1" "${non_main_dir}/"
popd
}
function move_to_main_dir()
{
pushd "${non_main_dir}"
- cp -a --parents "$1" "../${emacs_dir}/"
+ cp -a --parents "$1" "${main_dir}/"
rm "$1"
popd
}
function copy_to_main_dir()
{
pushd "${non_main_dir}"
- cp -a --parents "$1" "../${emacs_dir}/"
+ cp -a --parents "$1" "${main_dir}/"
popd
}
-
-
# So both sides will have a copy (at the very least, version.el refers to it).
copy_to_non_main_dir "etc/COPYING"
move_to_non_main_dir "etc/GNU"
move_to_non_main_dir "etc/MOTIVATION"
-# GFDL
-move_to_non_main_dir "lispintro"
-move_to_non_main_dir "lispref"
-
# reprinted with permissions or copyright mentioned
# no modification mention
move_to_non_main_dir "etc/INTERVIEW"
# This is used via debian/rules to track the nominal_ver.
copy_to_non_main_dir "lisp/version.el"
-# man files which appear to be compatible with the DFSG
-dfsg_man_files="
- faq.texi
- mh-e.texi"
+# GFDL documentation in doc/
+move_to_non_main_dir "doc/lispintro"
+move_to_non_main_dir "doc/lispref"
+move_to_non_main_dir "doc/emacs"
+
+# doc/misc
+
+# Most doc/misc files don't appear to be compatible with the DFSG.
+move_to_non_main_dir "doc/misc"
-pushd "${emacs_dir}"
-mkdir ../"${non_main_dir}"/man
-mv man/* ../"${non_main_dir}"/man/
-popd
+# doc/misc files that do appear to be compatible with the DFSG
+move_to_main_dir "doc/misc/faq.texi"
-# want these files in both archives, so put them back
-copy_to_main_dir "man/ChangeLog"
-copy_to_main_dir "man/Makefile.in"
+# Copy back files we want in both archives.
+copy_to_main_dir "doc/misc/ChangeLog"
+copy_to_main_dir "doc/misc/Makefile.in"
-for f in ${dfsg_man_files}
-do
- move_to_main_dir "man/$f"
-done
GZIP=-9v tar czpSf \
"emacs${emacs_major}_${emacs_version}+${deb_src_rev}.orig.tar.gz" \
section="Apps/Editors"\
title="Emacs @MENU_VERSION@ (X11)"\
command="/usr/bin/@DEB_FLAVOR@"\
- icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/emacs_16.xpm"\
- icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/emacs_32.xpm"\
+ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\
+ icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm"\
hints="Text"
?package(@PKG_NAME@):\
section="Apps/Editors"\
title="Emacs @MENU_VERSION@ (text)"\
command="/usr/bin/@DEB_FLAVOR@ -nw"\
- icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/emacs_16.xpm"\
- icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/emacs_32.xpm"\
+ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\
+ icon32x32="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm"\
hints="Text"
undesirable for some reason, just comment out
avoid-fakemail-loss.diff in debian/patches/series.
-Index: sid/lib-src/fakemail.c
+Index: b/lib-src/fakemail.c
===================================================================
---- sid.orig/lib-src/fakemail.c
-+++ sid/lib-src/fakemail.c
-@@ -135,8 +135,10 @@
+--- a/lib-src/fakemail.c
++++ b/lib-src/fakemail.c
+@@ -136,8 +136,10 @@
#define NIL ((line_list) NULL)
#define INITIAL_LINE_SIZE 200
#endif
static char *my_name;
-Index: sid/lisp/mail/feedmail.el
+Index: b/lisp/mail/feedmail.el
===================================================================
---- sid.orig/lisp/mail/feedmail.el
-+++ sid/lisp/mail/feedmail.el
-@@ -1348,7 +1348,12 @@
+--- a/lisp/mail/feedmail.el
++++ b/lisp/mail/feedmail.el
+@@ -1323,7 +1323,12 @@
"/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail")
"/usr/ucblib/sendmail")
nil errors-to nil "-oi" "-t")
;; provide envelope "from" to sendmail; results will vary
(list "-f" user-mail-address)
-Index: sid/lisp/mail/sendmail.el
+Index: b/lisp/mail/sendmail.el
===================================================================
---- sid.orig/lisp/mail/sendmail.el
-+++ sid/lisp/mail/sendmail.el
-@@ -53,7 +53,12 @@
+--- a/lisp/mail/sendmail.el
++++ b/lisp/mail/sendmail.el
+@@ -52,7 +52,12 @@
((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
"Program used to send messages."
:group 'mail
:type 'file)
-Index: sid/lisp/gnus/message.el
+Index: b/lisp/gnus/message.el
===================================================================
---- sid.orig/lisp/gnus/message.el
-+++ sid/lisp/gnus/message.el
-@@ -4026,7 +4026,13 @@
+--- a/lisp/gnus/message.el
++++ b/lisp/gnus/message.el
+@@ -4520,7 +4520,13 @@
"/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail")
"/usr/ucblib/sendmail")
+ (setq mail-interactive t)))
+ "fakemail"))
nil errbuf nil "-oi")
+ message-sendmail-extra-arguments
;; Always specify who from,
- ;; since some systems have broken sendmails.
* The default mail-from-style is 'system-default rather than 'angles.
-Index: sid/lisp/gnus/message.el
+Index: b/lisp/gnus/message.el
===================================================================
---- sid.orig/lisp/gnus/message.el
-+++ sid/lisp/gnus/message.el
-@@ -738,9 +738,14 @@
+--- a/lisp/gnus/message.el
++++ b/lisp/gnus/message.el
+@@ -808,9 +808,14 @@
(const never)
(const ask)))
:group 'message-sending
:link '(custom-manual "(message)Mail Variables")
:type 'boolean)
-Index: sid/lisp/mail/sendmail.el
+Index: b/lisp/mail/sendmail.el
===================================================================
---- sid.orig/lisp/mail/sendmail.el
-+++ sid/lisp/mail/sendmail.el
-@@ -59,7 +59,7 @@
+--- a/lisp/mail/sendmail.el
++++ b/lisp/mail/sendmail.el
+@@ -58,7 +58,7 @@
:type 'file)
;;;###autoload
site-init.el to include /usr/share/info/emacs-22 before
/usr/share/info.
-Index: sid/lisp/site-init.el
+Index: b/lisp/site-init.el
===================================================================
--- /dev/null
-+++ sid/lisp/site-init.el
++++ b/lisp/site-init.el
@@ -0,0 +1,11 @@
+
+;; Add the flavor specific directory for Debian.
* The global variable debian-emacs-flavor is bound to 'emacs22.
Author: Rob Browning <rlb@defaultvalue.org>
-Index: sid/lisp/startup.el
+Index: b/lisp/startup.el
===================================================================
---- sid.orig/lisp/startup.el
-+++ sid/lisp/startup.el
-@@ -302,6 +302,10 @@
- Warning Warning!!! Pure space overflow !!!Warning Warning
- \(See the node Pure Storage in the Lisp manual for details.)\n")
+--- a/lisp/startup.el
++++ b/lisp/startup.el
+@@ -394,6 +394,10 @@
+ (setq tutorial-directory (file-name-as-directory
+ (expand-file-name "tutorials" data-directory))))
+(defconst debian-emacs-flavor 'emacs22
+ "A symbol representing the particular debian flavor of emacs running.
(defun normal-top-level-add-subdirs-to-load-path ()
"Add all subdirectories of current directory to `load-path'.
More precisely, this uses only the subdirectories whose names
-@@ -826,8 +830,21 @@
+@@ -977,8 +981,21 @@
;; be loaded from site-run-file and wants to test if -q was given
;; should check init-file-user instead, since that is already set.
;; See cus-edit.el for an example.
Emacs invokes xmlstarlet rather than xml, which is the correct
executable name on Debian systems.
-Index: sid/lisp/progmodes/flymake.el
+Index: b/lisp/progmodes/flymake.el
===================================================================
---- sid.orig/lisp/progmodes/flymake.el
-+++ sid/lisp/progmodes/flymake.el
-@@ -1756,7 +1756,7 @@
+--- a/lisp/progmodes/flymake.el
++++ b/lisp/progmodes/flymake.el
+@@ -1754,7 +1754,7 @@
;;;; xml-specific init-cleanup routines
(defun flymake-xml-init ()
+++ /dev/null
-* A problem with saving non-ASCII buffers has been fixed.
- Patch: fix-mule-select-safe-coding.diff
- Provided-by: Jun Inoue <jun.lambda@gmail.com>
- Date: Sun, 29 Jun 2008 05:07:24 +0900
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: incorporated upstream
-
- Previously, Emacs would raise an error if even one coding system was
- rejected when trying to save a buffer containing non-ASCII text when
- select-safe-coding-system-accept-default-p was set to a function.
- Now Emacs should continue.
-
-Index: sid/lisp/international/mule-cmds.el
-===================================================================
---- sid.orig/lisp/international/mule-cmds.el
-+++ sid/lisp/international/mule-cmds.el
-@@ -733,7 +733,7 @@
- (let ((pos (point))
- (fill-prefix " "))
- (dolist (x (append rejected unsafe))
-- (princ " ") (princ (car x)))
-+ (princ " ") (princ x))
- (insert "\n")
- (fill-region-as-paragraph pos (point)))
- (when rejected
+++ /dev/null
-* The default vc-path variable value has been adjusted for Debian.
- Patch: fix-vc-path.diff
- Bug: 120079
-
-Index: sid/lisp/vc-hooks.el
-===================================================================
---- sid.orig/lisp/vc-hooks.el
-+++ sid/lisp/vc-hooks.el
-@@ -77,8 +77,8 @@
- :group 'vc)
-
- (defcustom vc-path
-- (if (file-directory-p "/usr/sccs")
-- '("/usr/sccs")
-+ (if (file-directory-p "/usr/lib/cssc")
-+ '("/usr/lib/cssc")
- nil)
- "*List of extra directories to search for version control commands."
- :type '(repeat directory)
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: new
-Index: sid/lisp/help.el
+Index: b/lisp/help.el
===================================================================
---- sid.orig/lisp/help.el
-+++ sid/lisp/help.el
-@@ -281,6 +281,14 @@
- \f
- ;;; `User' help functions
+--- a/lisp/help.el
++++ b/lisp/help.el
+@@ -297,6 +297,14 @@
+ (goto-address-mode 1)
+ (goto-char (point-min)))
+(defun debian-expand-file-name-dfsg (filename)
+ "Apply expand-file-name to FILENAME.
(defun describe-distribution ()
"Display info on how to obtain the latest version of GNU Emacs."
(interactive)
-@@ -295,7 +303,7 @@
+@@ -310,7 +318,7 @@
(defun describe-gnu-project ()
"Display info on the GNU project."
(interactive)
-- (view-file (expand-file-name "THE-GNU-PROJECT" data-directory))
-+ (view-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT"))
- (goto-char (point-min)))
+- (view-help-file "THE-GNU-PROJECT"))
++ (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT")))
(define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
-Index: sid/Makefile.in
+
+Index: b/Makefile.in
===================================================================
---- sid.orig/Makefile.in
-+++ sid/Makefile.in
-@@ -139,11 +139,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -139,12 +139,7 @@
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
infodir=@infodir@
--INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
-- elisp eintr emacs emacs-mime eshell eudc flymake \
-- forms gnus idlwave info message mh-e newsticker org pcl-cvs \
-- pgg reftex sc ses sieve speedbar tramp vip viper widget \
-- woman smtpmail url rcirc erc
-+INFO_FILES=efaq mh-e
+-INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \
+- ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc \
+- flymake forms gnus idlwave info mairix-el message mh-e \
+- newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember \
+- sasl sc ses sieve smtpmail speedbar tramp url vip viper \
+- widget woman
++INFO_FILES=efaq
# Directory for local state files for all programs.
localstatedir=@localstatedir@
-@@ -251,7 +247,7 @@
- SUBDIR = lib-src src
+@@ -270,7 +265,7 @@
+ SUBDIR = lib-src src lisp
- # The makefiles of the directories in $SUBDIR.
--SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
-+SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
+ # The subdir makefiles created by config.status.
+-SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
++SUBDIR_MAKEFILES = lib-src/Makefile doc/misc/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
-@@ -340,12 +336,6 @@
- man/Makefile: $(srcdir)/man/Makefile.in config.status
- ./config.status
-
--lispref/Makefile: $(srcdir)/lispref/Makefile.in config.status
-- ./config.status
--
--lispintro/Makefile: $(srcdir)/lispintro/Makefile.in config.status
-- ./config.status
--
- oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status
- ./config.status
-
-@@ -617,8 +607,6 @@
+@@ -357,10 +352,7 @@
+ $(srcdir)/Makefile.in \
+ $(srcdir)/src/Makefile.in \
+ $(srcdir)/lib-src/Makefile.in \
+- $(srcdir)/doc/emacs/Makefile.in \
+ $(srcdir)/doc/misc/Makefile.in \
+- $(srcdir)/doc/lispref/Makefile.in \
+- $(srcdir)/doc/lispintro/Makefile.in \
+ $(srcdir)/oldXMenu/Makefile.in \
+ $(srcdir)/lwlib/Makefile.in \
+ $(srcdir)/leim/Makefile.in \
+@@ -699,10 +691,7 @@
+ (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
(cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
(cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
- -(cd man && $(MAKE) $(MFLAGS) mostlyclean)
-- -(cd lispref && $(MAKE) $(MFLAGS) mostlyclean)
-- -(cd lispintro && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean)
(cd leim; $(MAKE) $(MFLAGS) mostlyclean)
### `clean'
-@@ -635,8 +623,6 @@
+@@ -718,10 +707,7 @@
+ (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)
(cd lib-src; $(MAKE) $(MFLAGS) clean)
- -(cd man && $(MAKE) $(MFLAGS) clean)
-- -(cd lispref && $(MAKE) $(MFLAGS) clean)
-- -(cd lispintro && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
- ### `distclean'
-@@ -655,8 +641,6 @@
+ ### `bootclean'
+@@ -742,10 +728,7 @@
+ (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
(cd lwlib; $(MAKE) $(MFLAGS) distclean)
(cd lib-src; $(MAKE) $(MFLAGS) distclean)
- (cd man && $(MAKE) $(MFLAGS) distclean)
-- (cd lispref && $(MAKE) $(MFLAGS) distclean)
-- (cd lispintro && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
+ (cd doc/misc && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean)
(cd leim; $(MAKE) $(MFLAGS) distclean)
(cd lisp; $(MAKE) $(MFLAGS) distclean)
${top_distclean}
-@@ -678,8 +662,6 @@
+@@ -758,10 +741,7 @@
+ (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
- -(cd man && $(MAKE) $(MFLAGS) maintainer-clean)
-- -(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean)
-- -(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
- (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
- ${top_distclean}
-@@ -717,8 +699,6 @@
- (cd lisp; $(MAKE) $(MFLAGS) unlock)
- (cd lisp/term; chmod u+w README *.el)
- (cd man; chmod u+w *texi* ChangeLog split-man)
-- (cd lispref; chmod u+w *texi* ChangeLog)
-- (cd lispintro; chmod u+w *texi* ChangeLog)
- (cd oldXMenu; chmod u+w *.[ch] Makefile README)
- (cd lwlib; chmod u+w *.[ch] Makefile README)
- (cd src; $(MAKE) $(MFLAGS) unlock)
-@@ -731,8 +711,6 @@
- (cd lisp; $(MAKE) $(MFLAGS) relock)
- (cd lisp/term; chmod u+w README *.el)
- (cd man; chmod u+w *texi* ChangeLog split-man)
-- (cd lispref; chmod u+w *texi* ChangeLog)
-- (cd lispintro; chmod u+w *texi* ChangeLog)
- (cd oldXMenu; chmod u+w *.[ch] Makefile README)
- (cd lwlib; chmod u+w *.[ch] Makefile README)
- (cd src; $(MAKE) $(MFLAGS) relock)
-@@ -755,12 +733,8 @@
- # so we can do ok running make in the build dir.
- info: force-info
- -(cd man; $(MAKE) $(MFLAGS) info)
-- -(cd lispref; $(MAKE) $(MFLAGS) info)
-- -(cd lispintro; $(MAKE) $(MFLAGS) info)
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+ ${top_bootclean}
+@@ -806,10 +786,7 @@
+ .PHONY: info dvi dist check html
+
+ info-real:
+- -(cd doc/emacs; $(MAKE) $(MFLAGS) info)
+ -(cd doc/misc; $(MAKE) $(MFLAGS) info)
+- -(cd doc/lispref; $(MAKE) $(MFLAGS) info)
+- -(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+
+ force-info:
+ # Note that man/Makefile knows how to
+@@ -843,10 +820,7 @@
+ echo "info/dir is OK"
+
dvi:
- (cd man; $(MAKE) $(MFLAGS) dvi)
-- (cd lispref; $(MAKE) $(MFLAGS) elisp.dvi)
-- (cd lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
+- (cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
+ (cd doc/misc; $(MAKE) $(MFLAGS) dvi)
+- (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
+- (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
#### Bootstrapping.
-@@ -810,6 +784,4 @@
- (cd lwlib; $(MAKE) $(MFLAGS) clean)
- (cd lib-src; $(MAKE) $(MFLAGS) clean)
- -(cd man && $(MAKE) $(MFLAGS) clean)
-- -(cd lispref && $(MAKE) $(MFLAGS) clean)
-- -(cd lispintro && $(MAKE) $(MFLAGS) clean)
- (cd leim; $(MAKE) $(MFLAGS) clean)
-Index: sid/man/Makefile.in
+Index: b/doc/misc/Makefile.in
===================================================================
---- sid.orig/man/Makefile.in
-+++ sid/man/Makefile.in
-@@ -33,24 +33,8 @@
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
- MAKEINFO = makeinfo --force
--INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
-- ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
-- ../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
-- ../info/info ../info/mh-e ../info/reftex \
-- ../info/sc ../info/vip ../info/viper ../info/widget \
-- ../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
-- ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
-- ../info/woman ../info/eshell ../info/org ../info/url \
-- ../info/speedbar ../info/tramp ../info/ses ../info/smtpmail \
-- ../info/flymake ../info/newsticker ../info/rcirc ../info/erc
--DVI_TARGETS = emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-- ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
-- gnus.dvi message.dvi sieve.dvi pgg.dvi mh-e.dvi \
-- reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
-- ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
-- pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
-- speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
-- newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
-+INFO_TARGETS = ../info/efaq ../info/mh-e
-+DVI_TARGETS = faq.dvi mh-e.dvi
- INFOSOURCES = info.texi
+--- a/doc/misc/Makefile.in
++++ b/doc/misc/Makefile.in
+@@ -38,96 +38,10 @@
- # The following rule does not work with all versions of `make'.
-@@ -61,65 +45,6 @@
- TEXI2DVI = texi2dvi
- ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+ # Also add new entries to INFO_FILES in the top-level Makefile.in.
+ INFO_TARGETS = \
+- $(infodir)/ada-mode \
+- $(infodir)/auth \
+- $(infodir)/autotype \
+- $(infodir)/calc \
+- $(infodir)/ccmode \
+- $(infodir)/cl \
+- $(infodir)/dbus \
+- $(infodir)/dired-x \
+- $(infodir)/ebrowse \
+- $(infodir)/ediff \
+- $(infodir)/emacs-mime \
+- $(infodir)/epa \
+- $(infodir)/erc \
+- $(infodir)/eshell \
+- $(infodir)/eudc \
+- $(infodir)/efaq \
+- $(infodir)/flymake \
+- $(infodir)/forms \
+- $(infodir)/gnus \
+- $(infodir)/idlwave \
+- $(infodir)/info \
+- $(infodir)/mairix-el \
+- $(infodir)/message \
+- $(infodir)/mh-e \
+- $(infodir)/newsticker \
+- $(infodir)/nxml-mode \
+- $(infodir)/org \
+- $(infodir)/pcl-cvs \
+- $(infodir)/pgg \
+- $(infodir)/rcirc \
+- $(infodir)/remember \
+- $(infodir)/reftex \
+- $(infodir)/sasl \
+- $(infodir)/sc \
+- $(infodir)/ses \
+- $(infodir)/sieve \
+- $(infodir)/smtpmail \
+- $(infodir)/speedbar \
+- $(infodir)/tramp \
+- $(infodir)/url \
+- $(infodir)/vip \
+- $(infodir)/viper \
+- $(infodir)/widget \
+- $(infodir)/woman
++ $(infodir)/efaq
--EMACS_XTRA=\
-- $(srcdir)/arevert-xtra.texi \
-- $(srcdir)/cal-xtra.texi \
-- $(srcdir)/dired-xtra.texi \
-- $(srcdir)/picture-xtra.texi \
-- $(srcdir)/emerge-xtra.texi \
-- $(srcdir)/vc-xtra.texi \
-- $(srcdir)/vc1-xtra.texi \
-- $(srcdir)/vc2-xtra.texi \
-- $(srcdir)/fortran-xtra.texi \
-- $(srcdir)/msdog-xtra.texi
--
--EMACSSOURCES= \
-- ${srcdir}/emacs.texi \
-- ${srcdir}/doclicense.texi \
-- ${srcdir}/gpl.texi \
-- ${srcdir}/screen.texi \
-- ${srcdir}/commands.texi \
-- ${srcdir}/entering.texi \
-- ${srcdir}/basic.texi \
-- ${srcdir}/mini.texi \
-- ${srcdir}/m-x.texi \
-- ${srcdir}/help.texi \
-- ${srcdir}/mark.texi \
-- ${srcdir}/killing.texi \
-- ${srcdir}/regs.texi \
-- ${srcdir}/display.texi \
-- ${srcdir}/search.texi \
-- ${srcdir}/fixit.texi \
-- ${srcdir}/files.texi \
-- ${srcdir}/buffers.texi \
-- ${srcdir}/windows.texi \
-- ${srcdir}/frames.texi \
-- ${srcdir}/mule.texi \
-- ${srcdir}/major.texi \
-- ${srcdir}/indent.texi \
-- ${srcdir}/text.texi \
-- ${srcdir}/programs.texi \
-- ${srcdir}/building.texi \
-- ${srcdir}/maintaining.texi \
-- ${srcdir}/abbrevs.texi \
-- ${srcdir}/sending.texi \
-- ${srcdir}/rmail.texi \
-- ${srcdir}/dired.texi \
-- ${srcdir}/calendar.texi \
-- ${srcdir}/misc.texi \
-- ${srcdir}/custom.texi \
-- ${srcdir}/trouble.texi \
-- ${srcdir}/cmdargs.texi \
-- ${srcdir}/xresources.texi \
-- ${srcdir}/anti.texi \
-- ${srcdir}/macos.texi \
-- ${srcdir}/msdog.texi \
-- ${srcdir}/gnu.texi \
-- ${srcdir}/glossary.texi \
-- ${srcdir}/ack.texi \
-- ${srcdir}/kmacro.texi \
-- $(EMACS_XTRA)
--
- info: $(top_srcdir)/info $(INFO_TARGETS)
+ DVI_TARGETS = \
+- ada-mode.dvi \
+- auth.dvi \
+- autotype.dvi \
+- calc.dvi \
+- cc-mode.dvi \
+- cl.dvi \
+- dbus.dvi \
+- dired-x.dvi \
+- ebrowse.dvi \
+- ediff.dvi \
+- emacs-mime.dvi \
+- epa.dvi \
+- erc.dvi \
+- eshell.dvi \
+- eudc.dvi \
+- faq.dvi \
+- flymake.dvi \
+- forms.dvi \
+- gnus.dvi \
+- idlwave.dvi \
+- info.dvi \
+- mairix-el.dvi \
+- message.dvi \
+- mh-e.dvi \
+- newsticker.dvi \
+- nxml-mode.dvi \
+- org.dvi \
+- pcl-cvs.dvi \
+- pgg.dvi \
+- rcirc.dvi \
+- reftex.dvi \
+- remember.dvi \
+- sasl.dvi \
+- sc.dvi \
+- ses.dvi \
+- sieve.dvi \
+- smtpmail.dvi \
+- speedbar.dvi \
+- tramp.dvi \
+- url.dvi \
+- vip.dvi \
+- viper.dvi \
+- widget.dvi \
+- woman.dvi
++ faq.dvi
- $(top_srcdir)/info:
-@@ -132,222 +57,16 @@
- # to exist in the build directory.
+
+ TEXI2DVI = texi2dvi
+@@ -154,278 +68,12 @@
# In a distribution of Emacs, the Info files should be up to date.
--# The following target uses an explicit -o switch to work around
--# the @setfilename directive in info.texi, which is required for
--# the Texinfo distribution.
--
--../info/info: ${INFOSOURCES}
-- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
--
--info.dvi: ${INFOSOURCES}
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+ ## "short" target names for convenience, to just rebuild one manual.
+-ada-mode : $(infodir)/ada-mode
+-$(infodir)/ada-mode: ada-mode.texi
+- cd $(srcdir); $(MAKEINFO) ada-mode.texi
+-ada-mode.dvi: ada-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
-
--../info/emacs: ${EMACSSOURCES}
-- cd $(srcdir); $(MAKEINFO) emacs.texi
+-auth : $(infodir)/auth
+-$(infodir)/auth: auth.texi
+- cd $(srcdir); $(MAKEINFO) auth.texi
+-auth.dvi: auth.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
-
--emacs.dvi: ${EMACSSOURCES}
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+-autotype : $(infodir)/autotype
+-$(infodir)/autotype: autotype.texi
+- cd $(srcdir); $(MAKEINFO) autotype.texi
+-autotype.dvi: autotype.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
-
--# This target is here so you could easily get the list of the *.texi
--# files which belong to the Emacs manual (as opposed to the separate
--# manuals for CL, CC Mode, Ebrowse, etc.). With this target, you can
--# say things like "grep foo `make emacsman`".
--emacsman:
-- @echo $(EMACSSOURCES)
+-calc : $(infodir)/calc
+-$(infodir)/calc: calc.texi
+- cd $(srcdir); $(MAKEINFO) calc.texi
+-calc.dvi: calc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
-
--../info/ccmode: cc-mode.texi
+-ccmode : $(infodir)/ccmode
+-$(infodir)/ccmode: cc-mode.texi
- cd $(srcdir); $(MAKEINFO) cc-mode.texi
-cc-mode.dvi: cc-mode.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
-
--../info/ada-mode: ada-mode.texi
-- cd $(srcdir); $(MAKEINFO) ada-mode.texi
--ada-mode.dvi: ada-mode.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
--
--../info/pcl-cvs: pcl-cvs.texi
-- cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
--pcl-cvs.dvi: pcl-cvs.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
--
--../info/eshell: eshell.texi
-- cd $(srcdir); $(MAKEINFO) eshell.texi
--eshell.dvi: eshell.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
--
--../info/cl: cl.texi
+-cl : $(infodir)/cl
+-$(infodir)/cl: cl.texi
- cd $(srcdir); $(MAKEINFO) cl.texi
-cl.dvi: cl.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
-
--../info/dired-x: dired-x.texi
+-dbus : $(infodir)/dbus
+-$(infodir)/dbus: dbus.texi
+- cd $(srcdir); $(MAKEINFO) dbus.texi
+-dbus.dvi: dbus.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
+-
+-dired-x : $(infodir)/dired-x
+-$(infodir)/dired-x: dired-x.texi
- cd $(srcdir); $(MAKEINFO) dired-x.texi
-dired-x.dvi: dired-x.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
-
--../info/ediff: ediff.texi
+-ebrowse : $(infodir)/ebrowse
+-$(infodir)/ebrowse: ebrowse.texi
+- cd $(srcdir); $(MAKEINFO) ebrowse.texi
+-ebrowse.dvi: ebrowse.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
+-
+-ediff : $(infodir)/ediff
+-$(infodir)/ediff: ediff.texi
- cd $(srcdir); $(MAKEINFO) ediff.texi
-ediff.dvi: ediff.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
-
--emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
+-emacs-mime : $(infodir)/emacs-mime
+-$(infodir)/emacs-mime: emacs-mime.texi
+- cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
+-emacs-mime.dvi: emacs-mime.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
+-
+-epa : $(infodir)/epa
+-$(infodir)/epa: epa.texi
+- cd $(srcdir); $(MAKEINFO) epa.texi
+-epa.dvi: epa.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
+-
+-erc : $(infodir)/erc
+-$(infodir)/erc: erc.texi
+- cd $(srcdir); $(MAKEINFO) erc.texi
+-erc.dvi: erc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
+-
+-eshell : $(infodir)/eshell
+-$(infodir)/eshell: eshell.texi
+- cd $(srcdir); $(MAKEINFO) eshell.texi
+-eshell.dvi: eshell.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
+-
+-eudc : $(infodir)/eudc
+-$(infodir)/eudc: eudc.texi
+- cd $(srcdir); $(MAKEINFO) eudc.texi
+-eudc.dvi: eudc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
+-
+ efaq : $(infodir)/efaq
+ $(infodir)/efaq: faq.texi
+ cd $(srcdir); $(MAKEINFO) faq.texi
+ faq.dvi: faq.texi
+ $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
+
+-flymake : $(infodir)/flymake
+-$(infodir)/flymake: flymake.texi
+- cd $(srcdir); $(MAKEINFO) flymake.texi
+-flymake.dvi: flymake.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
-
--../info/forms: forms.texi
+-forms : $(infodir)/forms
+-$(infodir)/forms: forms.texi
- cd $(srcdir); $(MAKEINFO) forms.texi
-forms.dvi: forms.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
-
-# gnus/message/emacs-mime/sieve/pgg are part of Gnus:
--../info/gnus: gnus.texi gnus-faq.texi
+-gnus : $(infodir)/gnus
+-$(infodir)/gnus: gnus.texi gnus-faq.texi
- cd $(srcdir); $(MAKEINFO) gnus.texi
-gnus.dvi: gnus.texi gnus-faq.texi
- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
- cp gnustmp.dvi $*.dvi
- rm gnustmp.*
-
--../info/message: message.texi
+-# This is produced with --no-split to avoid making files whose
+-# names clash on DOS 8+3 filesystems
+-idlwave : $(infodir)/idlwave
+-$(infodir)/idlwave: idlwave.texi
+- cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
+-idlwave.dvi: idlwave.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
+-
+-# The following target uses an explicit -o switch to work around
+-# the @setfilename directive in info.texi, which is required for
+-# the Texinfo distribution.
+-###info : $(infodir)/info # circular!
+-$(infodir)/info: info.texi
+- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
+-info.dvi: info.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+-
+-mairix-el : $(infodir)/mairix-el
+-$(infodir)/mairix-el: mairix-el.texi
+- cd $(srcdir); $(MAKEINFO) mairix-el.texi
+-mairix-el.dvi: mairix-el.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
+-
+-message : $(infodir)/message
+-$(infodir)/message: message.texi
- cd $(srcdir); $(MAKEINFO) message.texi
-message.dvi: message.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
-
--../info/sieve: sieve.texi
-- cd $(srcdir); $(MAKEINFO) sieve.texi
--sieve.dvi: sieve.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
+-mh-e : $(infodir)/mh-e
+-$(infodir)/mh-e: mh-e.texi
+- cd $(srcdir); $(MAKEINFO) mh-e.texi
+-mh-e.dvi: mh-e.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
-
--../info/emacs-mime: emacs-mime.texi
-- cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
--emacs-mime.dvi: emacs-mime.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
+-newsticker : $(infodir)/newsticker
+-$(infodir)/newsticker: newsticker.texi
+- cd $(srcdir); $(MAKEINFO) newsticker.texi
+-newsticker.dvi: newsticker.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+-
+-nxml-mode : $(infodir)/nxml-mode
+-$(infodir)/nxml-mode: nxml-mode.texi
+- cd $(srcdir); $(MAKEINFO) nxml-mode.texi
+-nxml-mode.dvi: nxml-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
+-
+-org : $(infodir)/org
+-$(infodir)/org: org.texi
+- cd $(srcdir); $(MAKEINFO) org.texi
+-org.dvi: org.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
+-
+-pcl-cvs : $(infodir)/pcl-cvs
+-$(infodir)/pcl-cvs: pcl-cvs.texi
+- cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
+-pcl-cvs.dvi: pcl-cvs.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
-
--../info/pgg: pgg.texi
+-pgg : $(infodir)/pgg
+-$(infodir)/pgg: pgg.texi
- cd $(srcdir); $(MAKEINFO) pgg.texi
-pgg.dvi: pgg.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
-
- ../info/mh-e: mh-e.texi
- cd $(srcdir); $(MAKEINFO) mh-e.texi
- mh-e.dvi: mh-e.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
-
--../info/reftex: reftex.texi
+-rcirc : $(infodir)/rcirc
+-$(infodir)/rcirc: rcirc.texi
+- cd $(srcdir); $(MAKEINFO) rcirc.texi
+-rcirc.dvi: rcirc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
+-
+-reftex : $(infodir)/reftex
+-$(infodir)/reftex: reftex.texi
- cd $(srcdir); $(MAKEINFO) reftex.texi
-reftex.dvi: reftex.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
-
--../info/sc: sc.texi
+-remember : $(infodir)/remember
+-$(infodir)/remember: remember.texi
+- cd $(srcdir); $(MAKEINFO) remember.texi
+-remember.dvi: remember.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
+-
+-sasl : $(infodir)/sasl
+-$(infodir)/sasl: sasl.texi
+- cd $(srcdir); $(MAKEINFO) sasl.texi
+-sasl.dvi: sasl.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
+-
+-sc : $(infodir)/sc
+-$(infodir)/sc: sc.texi
- cd $(srcdir); $(MAKEINFO) sc.texi
-sc.dvi: sc.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
-
--../info/vip: vip.texi
-- cd $(srcdir); $(MAKEINFO) vip.texi
--vip.dvi: vip.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
--
--../info/viper: viper.texi
-- cd $(srcdir); $(MAKEINFO) viper.texi
--viper.dvi: viper.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
--
--../info/widget: widget.texi
-- cd $(srcdir); $(MAKEINFO) widget.texi
--widget.dvi: widget.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
--
- ../info/efaq: faq.texi
- cd $(srcdir); $(MAKEINFO) faq.texi
- faq.dvi: faq.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
-
--../etc/GNU: gnu1.texi gnu.texi
-- cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
--
--../info/autotype: autotype.texi
-- cd $(srcdir); $(MAKEINFO) autotype.texi
--autotype.dvi: autotype.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
--
--../info/calc: calc.texi
-- cd $(srcdir); $(MAKEINFO) calc.texi
--
--calc.dvi: calc.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
--
--# This is produced with --no-split to avoid making files whose
--# names clash on DOS 8+3 filesystems
--../info/idlwave: idlwave.texi
-- cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
--idlwave.dvi: idlwave.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
--
--../info/eudc: eudc.texi
-- cd $(srcdir); $(MAKEINFO) eudc.texi
--eudc.dvi: eudc.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
--
--../info/ebrowse: ebrowse.texi
-- cd $(srcdir); $(MAKEINFO) ebrowse.texi
--ebrowse.dvi: ebrowse.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
--
--../info/woman: woman.texi
-- cd $(srcdir); $(MAKEINFO) woman.texi
--woman.dvi: woman.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
+-ses : $(infodir)/ses
+-$(infodir)/ses: ses.texi
+- cd $(srcdir); $(MAKEINFO) ses.texi
+-ses.dvi: ses.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
-
--../info/org: org.texi
-- cd $(srcdir); $(MAKEINFO) org.texi
--org.dvi: org.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
+-sieve : $(infodir)/sieve
+-$(infodir)/sieve: sieve.texi
+- cd $(srcdir); $(MAKEINFO) sieve.texi
+-sieve.dvi: sieve.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
-
--../info/url: url.texi
-- cd $(srcdir); $(MAKEINFO) url.texi
--url.dvi: url.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
+-smtpmail : $(infodir)/smtpmail
+-$(infodir)/smtpmail: smtpmail.texi
+- cd $(srcdir); $(MAKEINFO) smtpmail.texi
+-smtpmail.dvi: smtpmail.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
-
--../info/speedbar: speedbar.texi
+-speedbar : $(infodir)/speedbar
+-$(infodir)/speedbar: speedbar.texi
- cd $(srcdir); $(MAKEINFO) speedbar.texi
-speedbar.dvi: speedbar.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
-
--../info/tramp: tramp.texi trampver.texi
+-tramp : $(infodir)/tramp
+-$(infodir)/tramp: tramp.texi trampver.texi
- cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
-tramp.dvi: tramp.texi trampver.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
-
--../info/ses: ses.texi
-- cd $(srcdir); $(MAKEINFO) ses.texi
--ses.dvi: ses.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
--
--../info/smtpmail: smtpmail.texi
-- cd $(srcdir); $(MAKEINFO) smtpmail.texi
--smtpmail.dvi: smtpmail.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
--
--../info/flymake: flymake.texi
-- cd $(srcdir); $(MAKEINFO) flymake.texi
--flymake.dvi: flymake.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
+-url : $(infodir)/url
+-$(infodir)/url: url.texi
+- cd $(srcdir); $(MAKEINFO) url.texi
+-url.dvi: url.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
-
--../info/newsticker: newsticker.texi
-- cd $(srcdir); $(MAKEINFO) newsticker.texi
--newsticker.dvi: newsticker.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+-vip : $(infodir)/vip
+-$(infodir)/vip: vip.texi
+- cd $(srcdir); $(MAKEINFO) vip.texi
+-vip.dvi: vip.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
-
--../info/rcirc: rcirc.texi
-- cd $(srcdir); $(MAKEINFO) rcirc.texi
--rcirc.dvi: rcirc.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
+-viper : $(infodir)/viper
+-$(infodir)/viper: viper.texi
+- cd $(srcdir); $(MAKEINFO) viper.texi
+-viper.dvi: viper.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
-
--../info/erc: erc.texi
-- cd $(srcdir); $(MAKEINFO) erc.texi
--erc.dvi: erc.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
+-widget : $(infodir)/widget
+-$(infodir)/widget: widget.texi
+- cd $(srcdir); $(MAKEINFO) widget.texi
+-widget.dvi: widget.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
-
- mostlyclean:
- rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
+-woman : $(infodir)/woman
+-$(infodir)/woman: woman.texi
+- cd $(srcdir); $(MAKEINFO) woman.texi
+-woman.dvi: woman.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
+
-Index: sid/configure.in
+ mostlyclean:
+Index: b/configure.in
===================================================================
---- sid.orig/configure.in
-+++ sid/configure.in
-@@ -3346,7 +3346,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2952,8 +2952,8 @@
+ CPP_NEED_TRADITIONAL=yes)
AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
- man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \
-- lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile, [
-+ lisp/Makefile leim/Makefile, [
+- doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
+- doc/lispref/Makefile src/Makefile.c:src/Makefile.in \
++ doc/misc/Makefile \
++ src/Makefile.c:src/Makefile.in \
+ lwlib/Makefile lisp/Makefile leim/Makefile, [
### Make the necessary directories, if they don't exist.
- for dir in etc lisp ; do
licenses are in /usr/share/common-licenses), Emacs will now look for
NEWS to find the etc directory instead of GNU.
-Index: sid/src/callproc.c
+Index: b/src/callproc.c
===================================================================
---- sid.orig/src/callproc.c
-+++ sid/src/callproc.c
-@@ -1587,14 +1587,14 @@
+--- a/src/callproc.c
++++ b/src/callproc.c
+@@ -1521,14 +1521,14 @@
srcdir = Fexpand_file_name (build_string ("../src/"),
build_string (PATH_DUMPLOADSEARCH));
References to /usr/local/... have been changed to
/usr/... as appropriate, etc.
-Index: sid/etc/NEWS
+Index: b/etc/NEWS
===================================================================
---- sid.orig/etc/NEWS
-+++ sid/etc/NEWS
-@@ -15,6 +15,11 @@
+--- a/etc/NEWS
++++ b/etc/NEWS
+@@ -14,6 +14,11 @@
You can narrow news to a specific version by calling `view-emacs-news'
with a prefix argument or by typing C-u C-h C-n.
- \f
+
++ \f
+* Debian specific changes to Emacs
+
-+Please see /usr/share/doc/emacs22-common/README.Debian.gz.
++Please see /usr/share/doc/emacs23-common/README.Debian.gz.
+
-+\f
- * About external Lisp packages
+ \f
+ * Installation Changes in Emacs 23.1
- When you upgrade to Emacs 22 from a previous version, some older
the wrong locking strategy. To disable this check, comment out
require-movemail-use-liblockfile.diff in debian/patches/series.
-Index: sid/lib-src/movemail.c
+Index: b/lib-src/movemail.c
===================================================================
---- sid.orig/lib-src/movemail.c
-+++ sid/lib-src/movemail.c
-@@ -167,6 +167,10 @@
+--- a/lib-src/movemail.c
++++ b/lib-src/movemail.c
+@@ -166,6 +166,10 @@
/* Nonzero means this is name of a lock file to delete on fatal error. */
char *delete_lockname;
int
main (argc, argv)
int argc;
-Index: sid/src/s/bsd4-3.h
+Index: b/src/s/bsd-common.h
===================================================================
---- sid.orig/src/s/bsd4-3.h
-+++ sid/src/s/bsd4-3.h
-@@ -98,7 +98,11 @@
+--- a/src/s/bsd-common.h
++++ b/src/s/bsd-common.h
+@@ -66,7 +66,11 @@
The alternative is that a lock file named
/usr/spool/mail/$USER.lock. */
debian-adjust-mail-from-addresses.diff
handle-dfsg-split.diff
misc-unseparated.diff
-fix-vc-path.diff
require-movemail-use-liblockfile.diff
avoid-fakemail-mail-loss.diff
version-mention-debian.diff
-fix-mule-select-safe-coding.diff
look-for-news-to-find-etc.diff
fix-flymake-xmlstarlet-invocation.diff
autofiles.diff
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
-Index: sid/lisp/version.el
+Index: b/lisp/version.el
===================================================================
---- sid.orig/lisp/version.el
-+++ sid/lisp/version.el
-@@ -58,8 +58,8 @@
+--- a/lisp/version.el
++++ b/lisp/version.el
+@@ -57,8 +57,8 @@
(interactive "P")
(let ((version-string
(format (if (not (interactive-p))
# The flavor (i.e. emacs21) currently matches the source package name.
flavor := $(src_name)
-bin_priority := 25
+bin_priority := 26
# This might also be something like 2006-09-09 for snapshots.
menu_ver := $(major_ver)
# Info files that are going to show up in the main dir.
main_dir_info_files := \
- efaq \
- mh-e
+ efaq
# Files that the build stage depends on (may also be listed in other vars).
persistent_autogen_build_files := debian/control debian/copyright
endef
define build_cmd
- $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ $(MAKE) -C $(1) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ # If we don't use bootstrap, we need to explicitly build info.
+ $(MAKE) -C $(1) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" info
endef
# If we ever need to do the stripping outside of dh_strip, just add an
# INSTALL_STRIP="-s" to the make vars below.
-emacs_inst = (cd debian/$(1) && \
- $(MAKE) install \
- DESTDIR=$(2) \
+define emacs_inst
+ $(MAKE) -C debian/$(1) install DESTDIR=$(2) \
infodir=/usr/share/info/emacs-$(major_ver) \
- localstatedir=/var \
- manext=.1$(flavor))
+ localstatedir=/var
+endef
+
+
define patch
$(quilt) push -a
rm -f debian/stamp/configure
rm -f debian/stamp/build
-$(MAKE) distclean
- cd info && rm -f $$(ls | grep -v COPYING)
+ cd info && rm -f $$(ls | grep -v COPYING | grep -v '^dir$$')
dh_clean
$(unpatch)
# now clean up bits in the source tree that the above didn't handle
define cfg_tree
rm -rf $(1)
mkdir $(1)
+ cp -a $$(ls -A | grep -v '^debian$$' | grep -v '^.pc$$') "$(1)"
cd $(1) && CFLAGS="$(CFLAGS)" ../../configure $(confflags) $(2)
endef
debian/stamp/build: debian/stamp/configure $(autogen_build_files)
$(checkdir)
- # first build has to be a bootstrap build
- cd debian/build-x && $(build_cmd) bootstrap
- cd debian/build-x && $(build_cmd) clean
- cd debian/build-x && $(build_cmd)
- cd debian/build-nox && $(build_cmd)
- cd debian/build-gtk && $(build_cmd)
+ # See if we can do without the bootstrap now...
+ #cd debian/build-x && $(build_cmd) bootstrap
+ #cd debian/build-x && $(build_cmd) clean
+ $(call build_cmd,debian/build-x)
+ $(call build_cmd,debian/build-nox)
+ $(call build_cmd,debian/build-gtk)
mkdir -p debian/stamp && touch $@
rm -rf $(install_dir_x) $(install_dir_nox) $(install_dir_gtk)
-# $(call emacs_inst,build-x,$(install_dir_x))
-# $(call emacs_inst,build-nox,$(install_dir_nox))
-# $(call emacs_inst,build-gtk,$(install_dir_gtk))
-
- # Use X install dir for the common packages too.
+ # Deal with accidental multiple version problem.
+ rm -f debian/build-x/etc/DOC-$(runtime_ver).*
+ rm -f debian/build-x/src/emacs-$(runtime_ver).*
+ rm -f debian/build-x/src/emacs
$(call emacs_inst,build-x,$(install_dir_x))
+ # Deal with accidental multiple version problem.
+ rm -f debian/build-nox/etc/DOC-$(runtime_ver).*
+ rm -f debian/build-nox/src/emacs-$(runtime_ver).*
+ rm -f debian/build-nox/src/emacs
+ $(call emacs_inst,build-nox,$(install_dir_nox))
+
+ $(call emacs_inst,build-gtk,$(install_dir_gtk))
+
+# # Use X install dir for the common packages too.
+# $(call emacs_inst,build-x,$(install_dir_x))
+
##################################################
# emacsXY-common
rm $(pkgdir_common)/usr/share/emacs/site-lisp/subdirs.el
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
- && convert emacs_16.png emacs_16.xpm
+ && convert hicolor/16x16/apps/emacs.{png,xpm}
cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
- && convert emacs_32.png emacs_32.xpm
+ && convert hicolor/32x32/apps/emacs.{png,xpm}
# Mangle info files.
chmod 755 debian/mangle-info
perl -pi -e "s|man1/etags\\.1|man1/etags\\.1$(flavor)|" \
$(pkgdir_common)/usr/share/man/man1/ctags.1$(flavor)
+ cd $(pkgdir_common)/usr/share/man/man1/ && \
+ for f in *.1; do mv $$f $${f}$(flavor); done
+
# At least etc/COPYING is needed by M-x describe-copying.
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING
##################################################
# emacsXY-nox
$(call emacs_inst,build-nox,$(install_dir_nox))
+ echo point-2 >> debian/tmplog
+ find -name "DOC*" >> debian/tmplog
+
$(call install_common_binpkg_bits,\
$(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox)
+
+ echo point-3 >> debian/tmplog
+ find -name "DOC*" >> debian/tmplog
+
rm -rf $(install_dir_nox)
##################################################
# emacsXY-gtk
$(call emacs_inst,build-gtk,$(install_dir_gtk))
+ echo point-4 >> debian/tmplog
+ find -name "DOC*" >> debian/tmplog
+
$(call install_common_binpkg_bits,\
$(install_dir_gtk),$(pkgdir_gtk),$(flavor)-gtk,gtk)
+ echo point-5 >> debian/tmplog
+ find -name "DOC*" >> debian/tmplog
+
+
# install desktop entry
install -d $(pkgdir_gtk)/usr/share/applications
install -m 0644 \
projects / emacs.git / commitdiff